From a69a0358f60de0ce4d00645d1599f7f7284a32c2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 4 Feb 2011 18:47:39 +0000 Subject: [PATCH] libxl: vncviewer: make autopass work properly The file we write the vnc password to must be rewound back to the beginning, or the vnc viewer will simply get EOF. When the syscalls for communicating the password to the vnc client fail, bomb out with an error messsage rather than blundering on (and probably producing a spurious password prompt). Following this patch, xl vncviewer --autopass works, provided the qemu patch for writing the password to xenstore has also been applied. Signed-off-by: Ian Jackson Acked-by: Stefano Stabellini Committed-by: Ian Jackson --- tools/libxl/libxl.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c6723385a5..1554d8824a 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -827,25 +827,38 @@ int libxl_vncviewer_exec(libxl_ctx *ctx, uint32_t domid, int autopass) if ( vnc_pass ) { char tmpname[] = "/tmp/vncautopass.XXXXXX"; autopass_fd = mkstemp(tmpname); - if ( autopass_fd < 0 ) - goto skip_autopass; + if ( autopass_fd < 0 ) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "mkstemp %s failed", tmpname); + goto x_fail; + } - if ( unlink(tmpname) ) + if ( unlink(tmpname) ) { /* should never happen */ - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "unlink %s failed", tmpname); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "unlink %s failed", tmpname); + goto x_fail; + } if ( libxl_write_exactly(ctx, autopass_fd, vnc_pass, strlen(vnc_pass), - tmpname, "vnc password") ) { - do { close(autopass_fd); } while(errno == EINTR); - goto skip_autopass; + tmpname, "vnc password") ) + goto x_fail; + + if ( lseek(autopass_fd, SEEK_SET, 0) ) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "rewind %s (autopass) failed", tmpname); + goto x_fail; } args[2] = "-autopass"; } -skip_autopass: libxl__exec(autopass_fd, -1, -1, args[0], args); abort(); + + x_fail: + libxl__free_all(&gc); + return ERROR_FAIL; } /******************************************************************************/ -- 2.30.2